[v640][CMake] Init git before patches to ensure correct paths of patched files#22439
Merged
Conversation
guitargeek
changed the title
Test Results 22 files 22 suites 3d 13h 9m 0s ⏱️ For more details on these failures, see this check. Results for commit 7e2a756. ♻️ This comment has been updated with latest results. |
) * [win] Fix `git apply` failures in incremental builds * [cmake] Use marker files to detect if the patch has been applied (cherry picked from commit bfe9a83)
This fixes issue where the build directory is somewhere underneath a git repository, which affects `git apply` behaviour. This is commit 836cf1a from master, partially applied.
guitargeek
merged commit 428633d
into
root-project:v6-40-00-patches
31 of 33 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes issue where the build directory is somewhere underneath a git repository, which affects
git applybehaviour.Adapted from 836cf1a, the equivalent change made in the
masterbranch.